Fixed up some initialization errors.
Cleaned up some rubbish files.