initial
Fix names, problems with underscores in filename
BUGFIX to fading math