adding mateus fixes, updating documentation