Add more states, javadoc, force get, and save inventory