made updates and added more stuff