added constexpr where appropriate
some constexpr adjusted