final bug fixes and features added