moved some declarations around and started doc comments