fixed a few more bugs, did some testing, updated webpage