Cleaned up more comments. Sorted out some testcases.