merge in batman's changes, fix something