Cleaned up code, added some software