some minor improvements + tested BA support (not working)