replace own int() with String.to_integer()
minor enhancements