fixed bug with sitename
cleaner, leaner command helpers