Fixed all issues from feedback and added notes