Finished some feature requests