Variable Bugfixes and new facilities