minor changes, prefere echo to php end/start