some changes to be ubuntu friendly