Release 2.1.5.8 ready

Ready for releae. Cleaned up code.