Finished stuff after code review yesterday