More fixes, need to find out a way to output less to the piface