fixes, cosmetics