Removed some errors
Added Setup