fixes and features