Added some features that will be useful to the project.