Added Lots and lots. BUG FIXES