updates

Updating a lot of the base functions