slight optimisation of lookup
removed buggy border
Merge branch 'master' into production