special forms working again (except perhaps some of the defines)