Bugs Fixed

Bug 122 partially, BE is done but not handled on FE