comments+minor code fixes