Made initial constants more reasonable (again)