Fixing things, old and new..

More to come soon!