adaptions and little bug fix