Fixed all bugs!!