Fixed Bugs

Fixed all bugs except for Javascript verification that will be added for
interation 2.