Finished some more additional/needed features