some fixes here and there and testing stuff