Removed globals, improved installation