optional controls, various improvements, works