Added new scanners and various nice tidy ups.