bug fixes and features