added more parsing stuff