Fixed several bugs

Fixed parser and stuff