q!
Numerous small bug fixes
Numerous small bug fixes