some fixes, added second sceme