-Added more options and fixed PHP notice