Minor updates

Some bugs removed