Various input additions & fixes