Fixing bugs 0.1