Cleaned up build procedure, simplified cross system building