General fixes and improvements, pserver integration should be functioning