Fix lotsa little stuff!