moved type to correct location
Updated documentation, renamed a couple of methods