Many fixes, changes and additions. Removed unneeded runnables