added init, renamed file, setup corrected