some bugfixes and additional user options for EPIC