Adding some more code

Adding and fixing code