Small fixes, commenting