bar separator
bug fixes
merge with develop