Added more comments, small hotfixes