Fixes

Updates from the svn and removal of unnecessary files.