intermediate updates
add matlab stuff
big changes