added all files, cleaned stuff up