More documentatin + bug fixes