Minor updates/fixes for compiling and ease of experimentation.