Fixing up the visible stuff,

still needz a little work under the hood, but it's getting there.