added some pieces missing from the last commit, removed the options