Added Enum Constructors to Top Level Completion, some minor fixes/tweaks