fixed lot of stuff