Lots of bug fixed. Ready for use