More updates

this thing is starting to come together I think...