Some more standards and name rules and small
bug fixes