fixed setup files and comm problems