nearly there...

final update. thought about tb's idea, and it makes things a lot simpler.. and looks better, to me at least.