Fixed issues number: #7, #51, #52, and #68

#67 is still on progress.