various changes working boolean expression and cleaned up table