Some fixes and features added