Stabilise async dependency. Ensure else block exists in functions where required. Small restructure of interface file.