+ Fixed several bugs