Plawith with a few options and fixed some issues