Fixed some and added options