Fixed bugs! Should be good to go