fixes more chores bugs