small fix and add form swims