fixed non-portability and error in setup and added TODO