Command list separation into sereval files, small bug fixes