Fix some bugs, and format code (Commented out woolslabs for now)