add variables to config
remove bootstrap; several tweaks