Use release unless debug is asked for, cleaned up odds and ends