Fix minor errors
Further additions