Fixed bugs, made prettier