Minor updates....

Minor updates.... Cleaned up some code and stuff.