new files and fixes based on treehouse