Added somw new stuff and bugfixes
Added somw new stuff and bugfixes