Reviewd initial commit and added more features