General Improvements and bug fixes (now runs fine in your dev envoirement (cape bug))