fixed few issues + added automatic headers/fields