Some updates, adding a few useful features