Cleaned up some of the code and got rid of old commented code.  Also checked for all necessary features