general project fixes