fixes were needed still