Write a better startup sequence
Minor changes
Fix: Use the correct entity ID format