Fixed several issues