Fixed some empty key/value pairs
Fixed remaining effects