Bugs Fixed

Some bugs are fixed