More bug fixes and features added