FM+amp osc-modes
various clean ups n fixes