fixes and start formatting for JEB