fixed bugs. now running