lots of updates & cleaning & fixes