Fix bugs
beat steven