BUGFIX: fixed mutliple tiny bugs
fixed mergeconflict