fixing goals bugs