fixed bugs and built