Fixes. Moved some code around to make it neat. Added else and a placeholder for elif.