some defaults fixed