Uselessfiles

Fix some of the useless files, and make others work right again. 

Fixes #455