Fixed all bugs