Bug fixes and updated hardcoded work to dynamic loading