integrated future programs and fixed a small bug
added some file changes that got lost on the last commit
same
better version of config