fixes and exercises