more weaps/cleanup/layouts