Massive improvements done

Credits: ChipLeo, Palabola