Fixed bugs and made things more awesome