Major Upgrade, added some hot features and fixed some old bugs