Adding new files and handful bugs