refactored stuff and better weather...