Now uses SmartReset; other minor bugfixes