fixed some errorsz!