Slight input improvements. Fix #136