Small fixes, needs makeup.