Updated to OpenBSD 5.4 and minor code re-work