changed encoding, tweaks