bunch o fixes, also moved watch transactions