safari working on load + some cleanup