fixed major silly bug introduced in one of the last commits + improved comments