fix no @id issue
merge cleanup
bug fixes