some more polishing. almost complete