new fixes and features