Marked things TO DO for stable release
whitespace clean up