first real commit, ad hoc problems
corrected merge problems