fixed some errors
begin #16