Fixed several things as discussed with @hwoarangmy