Fixed setup + minor corrections