Design and Bug Fixes with Ameer