Minor improvements using base lib & added comment on what dropWS does