implemented a few fixes that have not gotten merged into the official repo yet