Fix alignment in proc/func arguments
Fix completion in package, do some housekeeping