Stable Build

Repaired bugs