minor fixes, some eye candy