bugs corrected, parser TODO list partially completed