some bugfixes, now just down to 'line number expected' bug