Fix #99 and partially fix #103

good question, i didn't remove them. maybe i have checked out an old revision... :confused: