fixed bunch of things