fixed elif issues