Removed unused code, added some test code in the read preset state... don't use...
Removed unused, reformated
Added a bit more to the interfaces
updates...