Began fixing some design related issues with EXS.