Fixed bugs and finalized v0.1