Added a few new features