Fixed all the bugs! --NOT--