Aaand fixed it up a bit more..