Little fixes and comment updates