initial add/obs
minor bug fixes