FF1 up and runiing + cleaned up the code
more cleanup