Fixed comments
Fill with buffer on startup