style / bug fixes