zwille fixed some errors