most issues fixed

just ave to get the FSPL issue worked out