Items: Fixed minor bugs, introduces more sources