fixed bunch of stuff