bug fixes and features added