minimal changes for 0.4.0 series

should still change it to not directly use env vars, etc.