* style fixes + hints + minor bugs fixes