Second commit

Bug fixes