removed unneccesary return in setup() & a debug