misc gravity commit bug fixes