forgot to save a file before commit
Fixed some more bugs, that occured after the merge of different sources of code