Simplified completion. Fixed bugs with / and ..