finished adjusting inputs + bug fixes