More work

Fixed even more things, now compabitle with SCP v1.0