Some tweaking, fixed an error