Misc things added