Better options handling + added --siteaccess option