Improved some extra things based on more strict inspection