#490 Issue ext fixes [WORK ON THIS]