Commented some stuff and merged some files.