fixed some parsing issues