Fixed several issues
fixed