Minor changes to Functions

Still need to build inventory and fix things