Some bug fixing for modernization, some better shortcut controller code. More still needs to be done.