various bug fixes / updates

to keep server up to date with the main one