Wrapping up

not many changes, just comitting