added options and cleanup