fixed the core and working on new features 0.3.1