Check for built package before building + cleanup + bugfixes.
Check for built package before building + cleanup + bugfixes.