Dev

Minor improvements