Fix location bug, Add inventory functions