0.0.1: bugs fixed