R-A-Q bug fixes and light touch