Improvements and temporary code for ad hoc reasons