More updated and fixes.