Finished registering system & other changes