Comments, unit tests, updates