Resume v0.24

fixed more things