Several updates

general cleaning