Fixed some comment
Made provision for an extras due to ports not working.
Added test variables.