Fixed bugs

Built and fixed bugs.