improve logic
Fix assemblyinfo