- Various improvements and cleanup