Did some cleaning up.
Added missing files.