Fixed several bugs, several improvements