Various fixes and features.