accel tests and slight design tweaks