5.1b

bunch of changes and shit