fixes and what not