#21 /remove and some fixes