More fixes and features