Misc enhancements - originally these were done in the guicify branch.
Merged in the desired ones to master