Dev

Stabilizing Build -- Various bugfixes