Bump version to 0.18 for hopeful Beta release
Remove some TODO comments that are todone