bunch o improvements