Fixed all bugs :)