everything fixed, need to plan next improvements