Few bugs fixed

Mainly to swap data over to other computer