fixed some parsing issues, fixed some variable issues