big improve

huft... just some form