Fixed spelling mistakes, added lots of features