migrate to phusion, add the FOLDER variable and other changes
Some fixes