fixed warning and small usablity improvements