fixing a bunch of problems after first prototype build