added more select options, cleaned the code a bit