some cleanup, fixed bugs when no site or channel was specified