1.5

fixed all kinds of buggs