new files, more bug fixes