Some bugfixes and added some informative text