Minor tweaks and fixed lap issue