several additions, including layouts from lain/copycats