some tweaks + fixed #486