small updates / bug fix