more rework
Wow.... works again, lovely
Cleanup and copyright