Multiple small fixes + additions

Small fixes and improvements :)