Fixing somethings up, looking a bit better now.