Fix 0.1

New bugs fixed