Fix
Fixed all bugs