Was able to compile latest changes; nicer formatting done