Lots of new features with some bug fixed