tweaking firewal and cleanup