finished last fixes, need the response from Jayme
Changes made by Jayme