Cleanup options and minor bugs