code brushed up;
some critical fixes;
added some shortcuts.