t808 - adjusting classes
t808 - final tweaks.