Commit #24.1

Changed: Little things