fixed bugs, now working