fixing comments stuff and small bugs