fixes and new attachment system
fix comments