Code adjustments, bug fixing etc.