some more testing
cleaning, and sme styles