Features added/bugs fixed