fixed a bunch of parse issues, now ready for web shit