fixes #79 and also cleaned up code organization some. Rewrote the bundle code to bundle properly. still needs work but much better.