almost done bugfixes
parser done