minor system improvements and bug fixes