added some stuff after code review