fix some bugs, start experimenting with atmosphere