Fix badge and cleanup a few things