cleaning up, improvements, etc