Fixed bug and wanked