Fix some errors... i hope