some changes not yet merged
everything merged, some errors