Some refactor and some answers modifications. Bug in 8 corrected