Misc fixes and features added