updating from xalbo and gleki

updating to xalbo's latest version + some sentences from IRC chat