fixes and features.