Updated features based on solution. Just some minor cleaning up of definitions and such.