Modified feature layout.
Created more features.
Updated list of private vars.