fix some little bugs and mark up todos by warning