Fixed all basic bugs (0.0.6)