added BMPs + other minor edits