improved resource bundling and cleaned up logging