Added some files, fix minor issues