Updated the finsystem files and some bits and pieces