Fixed some typo + Added some awesomeness