More improvments including foundation ivons
These should have been added in the last commit