pretty near certain it works for all cases now. also commented parser