cleanup
Tweak build
Tweak build and update to gcc49.