fixes based on galder's comments.