Adds a few more modules and fixes a few matlab bugs