3/5 done - fixed bugs