Cleaned up & fixed some errors that were in jcosta9's latest commit