Fix the Assignment errors

The process of fixing the known bugs in the code