Cleaned up some options
write some comments and another stuff