Fixed Bugs #2

Still debugging