Updated and added a few features