A bit more features added. A few bugs fixed as well