updated and reworked, added built in controls options